Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 26 Nov 2011 21:42:30 +0000 (13:42 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 26 Nov 2011 21:42:30 +0000 (13:42 -0800)
commita290b848a150931959f8c1cebeaa4d20f0bb1b86
tree9bd3781ad5d49af97c5ef9a111a23199df6c1e06
parent3dbba59709e0e220edfc3135c27b1578f1b4efd9
parentbee35e01be01846c4421c71d69bb1226c9dabfe6
Merge from trunk.